🎖️GitЯра🎖️
Commit 8a49f26cafc55ae078ca52e094c0af5130592aee
Parents : d5d50a9
Author : James Rich <2199651+jamesarich@users.noreply.github.com>
Signature : Signature validation error
Date : 2026-08-11T11:20:10-07:00
Committer : GitHub <noreply@github.com>
Date : 2026-08-11T13:20:10-05:00
fix(ci): replace 9.7-only --no-isolated-projects flag with property form (#6613)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Changes
8 files changed, 16 insertions(+), 14 deletions(-)
Diff
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
index 0b5a5b9f13..ffb8672bfb 100644
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -110,7 +110,7 @@ jobs:
--baseurl /${{ github.event.repository.name }}/main &
jekyll_pid=$!
if [ "$BUILD_DOKKA" = "true" ]; then
- ./gradlew dokkaGeneratePublicationHtml --no-isolated-projects --no-configuration-cache
+ ./gradlew dokkaGeneratePublicationHtml -Dorg.gradle.isolated-projects=false --no-configuration-cache
else
echo "No Dokka-relevant changes — skipping API reference rebuild."
fi
diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml
index 114e63e03b..d8b8cd43c1 100644
--- a/.github/workflows/docs-release.yml
+++ b/.github/workflows/docs-release.yml
@@ -104,7 +104,7 @@ jobs:
# Dokka API reference (/api/) — production releases only.
- name: Build Dokka HTML documentation
if: steps.version.outputs.is_production == 'true'
- run: ./gradlew dokkaGeneratePublicationHtml --no-isolated-projects --no-configuration-cache
+ run: ./gradlew dokkaGeneratePublicationHtml -Dorg.gradle.isolated-projects=false --no-configuration-cache
- name: Compile Jekyll Sites
env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 59f74eb01a..03eb986e26 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -459,7 +459,7 @@ jobs:
# are runtime-only and would be missed by :assemble).
- name: Generate Flatpak Sources
run: >
- ./gradlew --no-build-cache --no-isolated-projects --no-configuration-cache -Pmeshtastic.flatpakSources=true
+ ./gradlew --no-build-cache -Dorg.gradle.isolated-projects=false --no-configuration-cache -Pmeshtastic.flatpakSources=true
-Dgradle.user.home=${{ runner.temp }}/flatpak-gradle-home
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources
diff --git a/.github/workflows/reusable-check.yml b/.github/workflows/reusable-check.yml
index 451940b096..7410257245 100644
--- a/.github/workflows/reusable-check.yml
+++ b/.github/workflows/reusable-check.yml
@@ -131,9 +131,9 @@ jobs:
cache_configuration_cache: 'true' # VERSION_CODE pinned -> entries actually reuse
- name: Screenshot Test Validation
- # --no-isolated-projects: AGP's screenshot plugin iterates BuildServicesRegistry at
+ # -Dorg.gradle.isolated-projects=false: AGP's screenshot plugin iterates BuildServicesRegistry at
# execution time, which Isolated Projects forbids (fatal since Gradle 9.7).
- run: ./gradlew :screenshot-tests:validateDebugScreenshotTest -Pci=true --no-isolated-projects
+ run: ./gradlew :screenshot-tests:validateDebugScreenshotTest -Pci=true -Dorg.gradle.isolated-projects=false
- name: Upload screenshot diff report
if: failure()
@@ -452,9 +452,11 @@ jobs:
echo "VERSION_NAME=${BASE}-SNAPSHOT" >> "$GITHUB_ENV"
- name: Build Android APKs
- # --no-isolated-projects: the dependency-graph plugin injected by setup-gradle force-resolves
- # via allprojects{}, which Isolated Projects forbids (fatal since Gradle 9.7).
- run: ./gradlew androidApp:assembleFdroidDebug androidApp:assembleGoogleDebug -Pci=true --parallel --configuration-cache --no-isolated-projects --continue
+ # -Dorg.gradle.isolated-projects=false: the dependency-graph plugin injected by setup-gradle force-resolves
+ # via allprojects{}, which Isolated Projects forbids (fatal since Gradle 9.7). The property form is
+ # used everywhere instead of --no-isolated-projects: that flag only exists on Gradle 9.7+, and the
+ # wrapper is pinned to 9.6.1 until gradle/gradle#38787 ships in 9.7.1.
+ run: ./gradlew androidApp:assembleFdroidDebug androidApp:assembleGoogleDebug -Pci=true --parallel --configuration-cache -Dorg.gradle.isolated-projects=false --continue
- name: Upload debug artifact
if: ${{ inputs.upload_artifacts }}
@@ -578,7 +580,7 @@ jobs:
# runtime classpath. :assemble alone would miss runtime-only deps (skiko, ktor-cio, …).
- name: Generate Flatpak Sources
run: >
- ./gradlew --no-build-cache --no-isolated-projects --no-configuration-cache -Pmeshtastic.flatpakSources=true
+ ./gradlew --no-build-cache -Dorg.gradle.isolated-projects=false --no-configuration-cache -Pmeshtastic.flatpakSources=true
-Dgradle.user.home=${{ runner.temp }}/flatpak-gradle-home
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources
diff --git a/.github/workflows/scheduled-baseline.yml b/.github/workflows/scheduled-baseline.yml
index d15c54594a..7787913263 100644
--- a/.github/workflows/scheduled-baseline.yml
+++ b/.github/workflows/scheduled-baseline.yml
@@ -65,9 +65,9 @@ jobs:
# --no-configuration-cache: the underlying connectedGoogleNonMinifiedReleaseAndroidTest task is not
# config-cache serializable (SeparateTestModuleTestData / ResolutionBackedFileCollection), and the
# project enables org.gradle.configuration-cache by default — same workaround used in reusable-check.yml.
- # --no-isolated-projects must accompany it: Isolated Projects implies the configuration cache, and
+ # -Dorg.gradle.isolated-projects=false must accompany it: Isolated Projects implies the configuration cache, and
# Gradle 9.7+ hard-errors when the cache is disabled while Isolated Projects is on.
- script: ./gradlew :androidApp:generateGoogleReleaseBaselineProfile -Pci=true --no-isolated-projects --no-configuration-cache
+ script: ./gradlew :androidApp:generateGoogleReleaseBaselineProfile -Pci=true -Dorg.gradle.isolated-projects=false --no-configuration-cache
- name: Detect baseline profile changes
id: baseline
diff --git a/.github/workflows/verify-flatpak.yml b/.github/workflows/verify-flatpak.yml
index c878792c6d..39039b076d 100644
--- a/.github/workflows/verify-flatpak.yml
+++ b/.github/workflows/verify-flatpak.yml
@@ -51,7 +51,7 @@ jobs:
- name: Generate flatpak-sources.json
run: |
- ./gradlew --no-build-cache --no-isolated-projects --no-configuration-cache -Pmeshtastic.flatpakSources=true \
+ ./gradlew --no-build-cache -Dorg.gradle.isolated-projects=false --no-configuration-cache -Pmeshtastic.flatpakSources=true \
-Dgradle.user.home="$RUNNER_TEMP/flatpak-gradle-home" \
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources
cp build/flatpak-sources.json flatpak-sources.json
diff --git a/.skills/project-overview/SKILL.md b/.skills/project-overview/SKILL.md
index 13b6abef4e..fb716a3aae 100644
--- a/.skills/project-overview/SKILL.md
+++ b/.skills/project-overview/SKILL.md
@@ -74,5 +74,5 @@ Agents **MUST** perform these steps automatically at the start of every session
## Troubleshooting
- **Build Failures:** Check `gradle/libs.versions.toml` for dependency conflicts.
-- **Configuration Cache:** Add `--no-isolated-projects --no-configuration-cache` if cache-related issues persist. Both flags are required: Isolated Projects (on by default here) implies the configuration cache, and Gradle 9.7+ fails the build if you disable the cache without also disabling Isolated Projects.
+- **Configuration Cache:** Add `-Dorg.gradle.isolated-projects=false --no-configuration-cache` if cache-related issues persist. Both flags are required: Isolated Projects (on by default here) implies the configuration cache, and Gradle 9.7+ fails the build if you disable the cache without also disabling Isolated Projects.
- **Koin Injection Failures:** Verify the component is included in `AppKoinModule`.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 03416cdb05..35505a3078 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,7 +15,7 @@ Thank you for your interest in contributing to Meshtastic-Android! We welcome co
- Follow the [Kotlin Coding Conventions](https://kotlinlang.org/docs/coding-conventions.html) for Kotlin code.
- Use Android Studio's default formatting settings.
- We use [spotless](https://github.com/diffplug/spotless) for automated code formatting. You can run `./gradlew spotlessApply` to format your code automatically.
- - You can also run `./gradlew spotlessInstallGitPrePushHook --no-isolated-projects --no-configuration-cache` to install a pre-push Git hook that will run a `spotlessCheck`.
+ - You can also run `./gradlew spotlessInstallGitPrePushHook -Dorg.gradle.isolated-projects=false --no-configuration-cache` to install a pre-push Git hook that will run a `spotlessCheck`.
- Write clear, descriptive variable and function names.
- Add comments where necessary, especially for complex logic.
- Keep methods and classes focused and concise.
Served by rngit 1.5.0 - Generated in 0.11s